Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2011 04:52:52 +0000 (20:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2011 04:52:52 +0000 (20:52 -0800)

Trivial merge